* (bug 1931) cleanup, removing unused code and variables.